Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port "Fix bug where block_on was called from an async context" to main #7426

Merged
merged 2 commits into from
Jan 8, 2025

Conversation

MarkusPettersson98
Copy link
Contributor

@MarkusPettersson98 MarkusPettersson98 commented Jan 7, 2025

This PR simply ports #7425 to the main branch 😊


This change is Reviewable

@MarkusPettersson98 MarkusPettersson98 marked this pull request as ready for review January 7, 2025 16:29
Copy link
Member

@dlon dlon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm: 👍

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved


talpid-wireguard/src/lib.rs line 286 at r1 (raw file):

                    if let Err(err) =
                        tokio::task::spawn_blocking(move || log_tunnel_data_usage(&config, &tunnel))
                            .await

Wouldn't unwrapping be fine here?

Copy link
Contributor

@Serock3 Serock3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

Copy link
Contributor Author

@MarkusPettersson98 MarkusPettersson98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved


talpid-wireguard/src/lib.rs line 286 at r1 (raw file):

Previously, dlon (David Lönnhager) wrote…

Wouldn't unwrapping be fine here?

Probably, but I do not dare fix a panic-related bug while introducing an unwrap at this time 😄

@MarkusPettersson98 MarkusPettersson98 merged commit 02c7148 into main Jan 8, 2025
57 checks passed
@MarkusPettersson98 MarkusPettersson98 deleted the patch-block-on-in-tokio-task branch January 8, 2025 06:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants